Remove unused macro VMX_CPU_STATE_PG_ENABLED.

Use vmx_paging_enabled() instead.

Signed-off-by: Xin Li <xin.b.li@intel.com>

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 73037cc0d0058a2f7ae6468951e6faf05d071b88..fb34b0966d80c819ba1df9edbc9203d438f66f22 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -231,10 +231,9 @@ static inline int long_mode_do_msr_write(struct cpu_user_regs *regs)
         if ((msr_content & EFER_LME) ^
             test_bit(VMX_CPU_STATE_LME_ENABLED,
                      &vc->arch.hvm_vmx.cpu_state)){
-            if (test_bit(VMX_CPU_STATE_PG_ENABLED,
-                         &vc->arch.hvm_vmx.cpu_state) ||
-                !test_bit(VMX_CPU_STATE_PAE_ENABLED,
-                          &vc->arch.hvm_vmx.cpu_state)){
+            if ( vmx_paging_enabled(vc) ||
+                 !test_bit(VMX_CPU_STATE_PAE_ENABLED,
+                           &vc->arch.hvm_vmx.cpu_state)) {
                 vmx_inject_exception(vc, TRAP_gp_fault, 0);
             }
         }

diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h
index 703ae090f34479c7d1c2419f6e9e459e2bce2045..081b64d77399555947dfad5959a6d44bc2846a9f 100644 (file)
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -33,8 +33,7 @@ void vmx_relinquish_resources(struct vcpu *v);
 void vmx_enter_scheduler(void);
 
 enum {
-    VMX_CPU_STATE_PG_ENABLED=0,
-    VMX_CPU_STATE_PAE_ENABLED,
+    VMX_CPU_STATE_PAE_ENABLED=0,
     VMX_CPU_STATE_LME_ENABLED,
     VMX_CPU_STATE_LMA_ENABLED,
     VMX_CPU_STATE_ASSIST_ENABLED,